Adwaita: sass cleanup

aggregate circular button style to the main button structure.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 010b23dadc6bc369c7d4aa77ae914e45d3157408..49d5ef46bbf327eba8320ce49df8fb5b50c50bb2 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -764,6 +764,13 @@ button {
   .linked.vertical > &:active,
   .linked.vertical > &:checked,
   .linked.vertical > &:backdrop { @extend %linked_vertical; }
+
+  &.circular { // The Bloody Circul Button
+    border-radius: 9999px;
+    -gtk-outline-radius: 9999px;
+
+    label { padding: 0; }
+  }
 }
 
 %needs_attention {
@@ -4242,13 +4249,6 @@ cursor-handle {
 
 .context-menu { font: initial; } // Decouple the font of context menus from their entry/textview
 
-button.circular { // FIXME: aggregate to buttons
-  border-radius: 9999px;
-  -gtk-outline-radius: 9999px;
-
-  label { padding: 0; }
-}
-
 // shortcut window keys
 .keycap {
   min-width: 20px;

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 1ff6188827ed1846678df497e8f5f8e8028cb0f0..e34b0ec192d5a1375056b0d6cd8603cefd78ceff 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1153,6 +1153,11 @@ button:backdrop {
 .primary-toolbar
 button {
   -gtk-icon-shadow: none; }
+button.circular {
+  border-radius: 9999px;
+  -gtk-outline-radius: 9999px; }
+  button.circular label {
+    padding: 0; }
 
 .stack-switcher >
 button.needs-attention > label,
@@ -4508,12 +4513,6 @@ cursor-handle {
 .context-menu {
   font: initial; }
 
-button.circular {
-  border-radius: 9999px;
-  -gtk-outline-radius: 9999px; }
-  button.circular label {
-    padding: 0; }
-
 .keycap {
   min-width: 20px;
   min-height: 25px;

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 38f669825cdfe49ccf5d827aba2b797b30319641..0f181e1826532d69bd3b4710159c454116fceb08 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1156,6 +1156,11 @@ button:backdrop {
 .primary-toolbar
 button {
   -gtk-icon-shadow: none; }
+button.circular {
+  border-radius: 9999px;
+  -gtk-outline-radius: 9999px; }
+  button.circular label {
+    padding: 0; }
 
 .stack-switcher >
 button.needs-attention > label,
@@ -4539,12 +4544,6 @@ cursor-handle {
 .context-menu {
   font: initial; }
 
-button.circular {
-  border-radius: 9999px;
-  -gtk-outline-radius: 9999px; }
-  button.circular label {
-    padding: 0; }
-
 .keycap {
   min-width: 20px;
   min-height: 25px;